Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
167,122 Commits 3 Branches 0 Tags
9d00a58f192aae2dfb2fa3ea60f7df1728c20951
Commit Graph

4962 Commits

Author SHA1 Message Date
Dianne Hackborn
1cef19a306 am a22d2fc3: am 57af6ac7: am d190a5ca: am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit 'a22d2fc319069407d29a792e23910d8ba826ac34':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 22:07:04 +00:00
Jorim Jaggi
6151222e31 am 1137ea7e: am 782994ef: am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 
* commit '1137ea7eaf9d806b17a110c2f8ddfa21b58fc3fc':
  Apply color to progress bar for notifications
 2014-10-10 18:41:48 +00:00
Tim Kilbourn
716b1f1992 am 9d285e7f: am 79297f3c: am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '9d285e7f9905923a23c400ab76b630e4ad7c8c91':
  Don't start SearchDialog on television.
 2014-10-10 18:40:44 +00:00
Christopher Tate
f74fb2b3a5 am eb129805: am 05d7f0df: am a4d5471f: am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 
* commit 'eb129805b5460709a7f4155530b7863656dc0d96':
  Turn on dimension validation in wallpaper restore
 2014-10-10 18:40:06 +00:00
Adam Lesinski
a5ebe01da3 am 557b8d7c: am bd1867e4: am 03be7ab5: am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '557b8d7cbdeaeeaaea792f6a85c74cfb34845e41':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-10 18:39:49 +00:00
Dianne Hackborn
a22d2fc319 am 57af6ac7: am d190a5ca: am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '57af6ac767ff7063adbff694ff784e9ddc442a7e':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 17:14:36 +00:00
Jorim Jaggi
1137ea7eaf am 782994ef: am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 
* commit '782994efd30a153af44c38a9871d24fecb0eb609':
  Apply color to progress bar for notifications
 2014-10-10 17:01:07 +00:00
Tim Kilbourn
9d285e7f99 am 79297f3c: am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '79297f3c1c7898a194310169ef499889ed544a57':
  Don't start SearchDialog on television.
 2014-10-10 16:59:04 +00:00
Christopher Tate
eb129805b5 am 05d7f0df: am a4d5471f: am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 
* commit '05d7f0dfe8352aab87d35f42209b1d34ae30b2d1':
  Turn on dimension validation in wallpaper restore
 2014-10-10 16:57:50 +00:00
Adam Lesinski
557b8d7cbd am bd1867e4: am 03be7ab5: am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit 'bd1867e48e9655c266fa901ec7bc9f85f8fb5c11':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-10 16:57:35 +00:00
Dianne Hackborn
d95f1c991c am 75a6e82b: am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '75a6e82bcc625025c5f48dc6c33d0dd469e9ca61':
  Put in real "code" (aka marketing) name.
 2014-10-10 05:41:19 +00:00
Dianne Hackborn
75a6e82bcc am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
  Put in real "code" (aka marketing) name.
 2014-10-10 04:26:40 +00:00
Dianne Hackborn
d190a5ca4c am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '0e259ce2d7ed09c58993da5c5b63966e8f467c82':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 00:30:33 +00:00
Jorim Jaggi
51650235c1 Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 2014-10-09 22:01:56 +00:00
Tim Kilbourn
bb76d5cd88 am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '5d7f58be2c034823d6e5cfab847ad50b2a463dfc':
  Don't start SearchDialog on television.
 2014-10-09 19:17:10 +00:00
Jorim Jaggi
ef72a198af Apply color to progress bar for notifications 
Bug: 17128179
Change-Id: Ia642ff2a352bbabf2d1e468367d45dc188ee0e73
 2014-10-09 11:37:00 -07:00
Dianne Hackborn
fdf5b35ab4 Implement issue #17906468: Allow search request to fall back to global search 
Change-Id: I04834b2a9f1ec4a68c6a3fed14da2f8dd93b3be7
 2014-10-09 10:37:19 -07:00
Christopher Tate
a4d5471fc6 am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 
* commit '3a8e28c1d7dc474b70e937774de5eba70d528674':
  Turn on dimension validation in wallpaper restore
 2014-10-09 16:57:51 +00:00
Adam Lesinski
03be7ab529 am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '6167950b7a5a8b9f021e9656b42b9b48bfbcbf80':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 16:57:34 +00:00
Dianne Hackborn
d83e9e4280 am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:03:21 +00:00
Tim Kilbourn
37bd07768a Merge "Don't start SearchDialog on television." into lmp-dev 2014-10-09 00:49:36 +00:00
Tim Kilbourn
99e9095430 Don't start SearchDialog on television. 
Bug: 17654744
Change-Id: Ie76405d648b7ac34a70465e275315f9cf277a3fe
 2014-10-08 17:01:42 -07:00
Christopher Tate
c0a30bcfae Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 2014-10-08 21:48:10 +00:00
Adam Lesinski
59d208ddc1 Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-dev 2014-10-08 20:34:55 +00:00
Adam Lesinski
54e064bcea Remove UsageEvents#resetToStart() as it doesn't work 
After completely iterating over a UsageEvents object, the internal parcel
is recycled. If resetToStart is called then, it does nothing.

Bug:17909428
Change-Id: I7bc68d3429e4621a50dedbfc1789576d44dbb3be
 2014-10-08 12:33:16 -07:00
Christopher Tate
431906b34f Turn on dimension validation in wallpaper restore 
Bug 17906491

Change-Id: I4c76c3197df95b51a6e44d1fe2d522b6c05284e5
 2014-10-08 12:19:48 -07:00
Dianne Hackborn
89b196958f Merge "Put in real "code" (aka marketing) name." into lmp-dev 2014-10-08 17:59:19 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Christopher Tate
23eb3bc588 am 9c1ca9e0: am a9dd05cd: am 152893dd: am 93e5e859: am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev 
* commit '9c1ca9e0ff47cd94520533e955334f66d6c3b1e7':
  Accept any restored wallpaper
 2014-10-07 22:12:35 +00:00
Christopher Tate
9c1ca9e0ff am a9dd05cd: am 152893dd: am 93e5e859: am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev 
* commit 'a9dd05cdb7541a93780e6420c5eb1e75006a83b9':
  Accept any restored wallpaper
 2014-10-07 22:08:33 +00:00
Christopher Tate
152893dd66 am 93e5e859: am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev 
* commit '93e5e859e3d2c0f4d4f47c90d370b38be4440655':
  Accept any restored wallpaper
 2014-10-07 21:59:10 +00:00
Christopher Tate
ae456fd894 Merge "Accept any restored wallpaper" into lmp-dev 2014-10-07 21:50:08 +00:00
Adam Lesinski
ee437a6915 am d6353c8c: am 5166be90: am 18ab83e5: am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit 'd6353c8c0ee7f4a16c129df90679e734f735b4c9':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:41:11 +00:00
Adam Lesinski
d6353c8c0e am 5166be90: am 18ab83e5: am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '5166be9007b65728e0c55e88ef4d25417a8157ce':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:34:50 +00:00
Adam Lesinski
18ab83e571 am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit 'f189c445b84365a3f1bd2b678fdca37f9df8d5d1':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:03:24 +00:00
Adam Lesinski
1a98dd5cc7 Merge "Load shared library dependencies for AppWidgets" into lmp-dev 2014-10-07 19:51:17 +00:00
Adam Lesinski
d00bb5edcf Load shared library dependencies for AppWidgets 
PackageManager and AppWidgetHostServiceImpl should
be loading the resources of any shared libraries being
used by the app, as they have references in their Widgets
or application icons/labels, etc.

Bug:17668152
Change-Id: I359662334edb125d7570089916727df4eeba02bb
 2014-10-07 12:14:45 -07:00
Christopher Tate
406abd4547 Accept any restored wallpaper 
...and let the wallpaper service & hosts figure out what to do
with it.

Bug 17677006

Change-Id: Ie5bfa549af4da178e621ffc42a759a552897d93a
 2014-10-06 18:00:51 -07:00
Dianne Hackborn
22dbaddf58 am 8b718b80: am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '8b718b80e0caf179a174f8417fe4f5b875297de6':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:43:58 +00:00
Dianne Hackborn
8b718b80e0 am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:39:50 +00:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:22:53 +00:00
Benjamin Franz
53ae7745b0 am adabf536: am 00fcb749: am 31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev 
* commit 'adabf536fbb971b2eb50a37f563e3027bda04061':
  Introduce new API to get an unbadged icon and unbadge permissions.
 2014-10-06 16:56:48 +00:00
Benjamin Franz
adabf536fb am 00fcb749: am 31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev 
* commit '00fcb749cbd26c83d1a29a974bd92967b41c5882':
  Introduce new API to get an unbadged icon and unbadge permissions.
 2014-10-06 16:52:27 +00:00
Benjamin Franz
31409c0ccd Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev 2014-10-06 16:26:27 +00:00
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change 
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
 2014-10-03 16:26:04 -07:00
Benjamin Franz
ec2d48b96d Introduce new API to get an unbadged icon and unbadge permissions. 
Bug: 17125560
Change-Id: I61b884186c96cc54dcaf1d3c7ee8f47610fd1d21
 2014-10-03 09:41:08 +01:00
Christopher Tate
5d12de3e4a am 6f6dd6ed: am 1d647ab5: am 61eae160: am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit '6f6dd6edacc5b86604d3276ee710996bcb980a3a':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 22:12:39 +00:00
Christopher Tate
6f6dd6edac am 1d647ab5: am 61eae160: am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit '1d647ab5591ff58796868513edc62050c99b6541':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 22:01:53 +00:00
Christopher Tate
61eae1605d am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit 'ac3aed96eb9d3ac5bde4c4a56d1b7ba5c2a079f0':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 21:48:24 +00:00
Christopher Tate
004c16654f Tweak wallpaper restore acceptance heuristics 
We now accept for restore any image that is at least wide enough to
fit the screen, and has a height within a comfortable margin of the
previously stated target.

Bug 17677006

Change-Id: I5937a82ddfbfa0bbb30d568621eb48e4b3533fac
 2014-10-02 14:27:09 -07:00