George Mount
619f2ebf32
Merge "Fix ArcMotion path creation in some quadrants." into nyc-dev am: fdce57b6dc
...
am: 28f3738335
* commit '28f3738335d4fb09da1e1580a480a011bdd2bf74':
Fix ArcMotion path creation in some quadrants.
2016-03-10 18:26:56 +00:00
George Mount
28f3738335
Merge "Fix ArcMotion path creation in some quadrants." into nyc-dev
...
am: fdce57b6dc
* commit 'fdce57b6dc931c6d038117d34b70e97a22de2b27':
Fix ArcMotion path creation in some quadrants.
2016-03-10 18:24:47 +00:00
George Mount
fdce57b6dc
Merge "Fix ArcMotion path creation in some quadrants." into nyc-dev
2016-03-10 18:19:10 +00:00
Todd Kennedy
0ef1569f17
Merge "fix docs" into nyc-dev am: 23ca16865a
...
am: 08651fb868
* commit '08651fb86876711b5de8f22b2c9904c02b99aab9':
fix docs
2016-03-10 18:17:59 +00:00
Todd Kennedy
08651fb868
Merge "fix docs" into nyc-dev
...
am: 23ca16865a
* commit '23ca16865ae63a482f8725f663231389a7984202':
fix docs
2016-03-10 18:15:57 +00:00
Todd Kennedy
23ca16865a
Merge "fix docs" into nyc-dev
2016-03-10 18:11:31 +00:00
Todd Kennedy
1ed6b87634
fix docs
...
No code change; just doc clarification per API Review Council suggestions
Bug: 27531045
Change-Id: Ib1eef9635d68d44be596888b46de0650883d118c
2016-03-10 10:07:00 -08:00
Christopher Tate
f1dd9d9e2f
Merge "Improve AlarmManager docs" into nyc-dev am: 4206bde4d7
...
am: c097e6eb93
* commit 'c097e6eb9379f32d850c941ea44fad7a0a05b9c8':
Improve AlarmManager docs
2016-03-10 18:03:57 +00:00
Christopher Tate
c097e6eb93
Merge "Improve AlarmManager docs" into nyc-dev
...
am: 4206bde4d7
* commit '4206bde4d731a0633f7a4ef778f4d92a4b1adb4a':
Improve AlarmManager docs
2016-03-10 18:01:52 +00:00
Chris Tate
4206bde4d7
Merge "Improve AlarmManager docs" into nyc-dev
2016-03-10 17:58:19 +00:00
Chris Wren
6f4157a3ca
Merge "revert recent changes around system listener registrations" into nyc-dev am: 46820517e4
...
am: a5f9c63402
* commit 'a5f9c634028a85fda77cdda66800c0d25327fae8':
revert recent changes around system listener registrations
2016-03-10 17:45:47 +00:00
Chris Wren
a5f9c63402
Merge "revert recent changes around system listener registrations" into nyc-dev
...
am: 46820517e4
* commit '46820517e449de678ac103a39b69276efe412eed':
revert recent changes around system listener registrations
2016-03-10 17:43:44 +00:00
Chris Wren
46820517e4
Merge "revert recent changes around system listener registrations" into nyc-dev
2016-03-10 17:39:52 +00:00
Muyuan Li
e7a4731d12
Merge "Added shortcut key to dock windows" into nyc-dev am: 2f14bb31ae
...
am: 7ed17fbde2
* commit '7ed17fbde2d6bdcbf7e47e212e35c1d524346e59':
Added shortcut key to dock windows
2016-03-10 17:39:34 +00:00
Muyuan Li
7ed17fbde2
Merge "Added shortcut key to dock windows" into nyc-dev
...
am: 2f14bb31ae
* commit '2f14bb31aeb2a736b5120e8b89abeb260d513e37':
Added shortcut key to dock windows
2016-03-10 17:35:51 +00:00
Muyuan Li
2f14bb31ae
Merge "Added shortcut key to dock windows" into nyc-dev
2016-03-10 17:33:44 +00:00
Jesse Hall
858d833621
Merge "Refer to hasSystemFeature(String, int) in Vulkan feature docs" into nyc-dev am: a3fc34c71d
...
am: 9a38ba89e5
* commit '9a38ba89e58f7ba6d78801dda015d77740cdb534':
Refer to hasSystemFeature(String, int) in Vulkan feature docs
2016-03-10 17:25:41 +00:00
Jesse Hall
9a38ba89e5
Merge "Refer to hasSystemFeature(String, int) in Vulkan feature docs" into nyc-dev
...
am: a3fc34c71d
* commit 'a3fc34c71dd57ae3b7ac4972453ce7fab0dc62bb':
Refer to hasSystemFeature(String, int) in Vulkan feature docs
2016-03-10 17:23:15 +00:00
Jesse Hall
39ceeb5472
Refer to hasSystemFeature(String, int) in Vulkan feature docs
...
Bug: 27531286
Change-Id: Ifb32ae519fc8118923d6216e1d574cbbf83dfd23
2016-03-10 09:04:26 -08:00
Chris Wren
b7c810957f
revert recent changes around system listener registrations
...
also guard against the ranker calling the self-service registration functions.
"why do we even have that lever?"
Bug: 27577115
Change-Id: I8a01cfdd801320e53d56bcbf515b9ba17e677166
2016-03-10 11:41:10 -05:00
Daniel Micay
b9e8f4602a
Merge "fix SeekBarPreference support for summaries" am: 06ce16a54c
...
am: b562aaaa4c
* commit 'b562aaaa4c484682d5ae46ebfed04062fa7e13c2':
fix SeekBarPreference support for summaries
2016-03-10 15:35:50 +00:00
Daniel Micay
b562aaaa4c
Merge "fix SeekBarPreference support for summaries"
...
am: 06ce16a54c
* commit '06ce16a54c971e922d9e34cc5a57f012614db20f':
fix SeekBarPreference support for summaries
2016-03-10 15:33:51 +00:00
Daniel Micay
084ee67b35
fix SeekBarPreference support for summaries
...
Overriding getSummary breaks support for summaries even though it's
supported in the layout for SeekBarPreference. If there's no summary the
return value is already null in the inherited implementation.
Change-Id: I2e72ea3c4a624acbf200e9617173eb072572fa57
2016-03-09 21:50:30 -05:00
Hyunyoung Song
377d000e59
Merge "Revert "Apply transformations while offsetting focused rects"" into nyc-dev am: ef33726e14
...
am: c742752735
* commit 'c742752735a506b31f1ec62dd1b376656356d03b':
Revert "Apply transformations while offsetting focused rects"
2016-03-10 02:30:29 +00:00
Hyunyoung Song
c742752735
Merge "Revert "Apply transformations while offsetting focused rects"" into nyc-dev
...
am: ef33726e14
* commit 'ef33726e1439adeb408b0ca44f0ee55042dad26d':
Revert "Apply transformations while offsetting focused rects"
2016-03-10 02:28:28 +00:00
Hyunyoung Song
4eb1a4e003
Revert "Apply transformations while offsetting focused rects"
...
b/27335262
This reverts commit 83e725da7a .
Change-Id: I55079bbaab81610e9de3a8d68ed21cf352da5983
2016-03-10 02:19:14 +00:00
Christopher Tate
2affae90b8
Improve AlarmManager docs
...
In particular, add some missing information about what
getNextAlarmClock() returns.
Bug 27562400
Change-Id: I8c76b0c4208082d4da8ea490518e023584da6440
2016-03-09 17:56:32 -08:00
Dianne Hackborn
1f786e4bcd
Merge "DO NOT MERGE: Add separate information about user whitelist." into nyc-dev
...
am: 839ff816a5
* commit '839ff816a516a6eb806aee2cef681ad3b3c14b56':
DO NOT MERGE: Add separate information about user whitelist.
2016-03-10 01:53:05 +00:00
Dianne Hackborn
839ff816a5
Merge "DO NOT MERGE: Add separate information about user whitelist." into nyc-dev
2016-03-10 01:46:03 +00:00
Dianne Hackborn
262ae5c8eb
DO NOT MERGE: Add separate information about user whitelist.
...
Use this in the alarm manager to allow user whitelisted apps
to have free access to scheduling alarms.
Coming next: lifting sync/job restrictions.
Bug #26851107 : Allow user whitelist apps more freedom
(Cherry-picked to nyc since it got lost in the branch from master.)
Change-Id: I4dc9f07514627ebdb6b6eff7c7a749f2c51a3797
2016-03-09 17:39:40 -08:00
Joe Onorato
ca3cbc1d63
Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev am: 04a72a2a51
...
am: af2d5fb699
* commit 'af2d5fb699e18378190139411c87046fa07be092':
Add an API for apps to get their System Health / Battery Stats data.
2016-03-10 01:02:12 +00:00
Joe Onorato
af2d5fb699
Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev
...
am: 04a72a2a51
* commit '04a72a2a51ce3d128959b2ba53b5c22576322e59':
Add an API for apps to get their System Health / Battery Stats data.
2016-03-10 00:58:30 +00:00
Joe Onorato
04a72a2a51
Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev
2016-03-10 00:52:03 +00:00
Yin-Chia Yeh
0fe56494f3
Merge "Camera: codegen update" into nyc-dev am: 0ae49cc667
...
am: 1f85a37630
* commit '1f85a37630357f68beba0e06f036ac54ff279f83':
Camera: codegen update
2016-03-10 00:34:05 +00:00
Yin-Chia Yeh
1f85a37630
Merge "Camera: codegen update" into nyc-dev
...
am: 0ae49cc667
* commit '0ae49cc667c20a30ba800bfb03c4caf872169d93':
Camera: codegen update
2016-03-10 00:32:05 +00:00
Yin-Chia Yeh
0ae49cc667
Merge "Camera: codegen update" into nyc-dev
2016-03-10 00:24:56 +00:00
Makoto Onuki
7e4a7fcfae
Merge "ShortcutManaegr: load config from settings, also..." into nyc-dev am: 495d124a67
...
am: 837a5fd72d
* commit '837a5fd72d4ee48b94d3c9f5dc9a409ecfd3caf9':
ShortcutManaegr: load config from settings, also...
2016-03-10 00:24:23 +00:00
Makoto Onuki
837a5fd72d
Merge "ShortcutManaegr: load config from settings, also..." into nyc-dev
...
am: 495d124a67
* commit '495d124a67daa1f070ca0ca0be0c14377675200a':
ShortcutManaegr: load config from settings, also...
2016-03-10 00:22:17 +00:00
Makoto Onuki
495d124a67
Merge "ShortcutManaegr: load config from settings, also..." into nyc-dev
2016-03-10 00:18:36 +00:00
Jeff Sharkey
b6f9e05222
Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev am: 6b432fa255
...
am: ffc1208daf
* commit 'ffc1208daf819e6f4cb87228f0ad58354999914f':
Restrict TrafficStats due to privacy concerns.
2016-03-10 00:11:09 +00:00
Jeff Sharkey
ffc1208daf
Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev
...
am: 6b432fa255
* commit '6b432fa255db0a24388a0698cfe3e01190a4f2ce':
Restrict TrafficStats due to privacy concerns.
2016-03-10 00:06:49 +00:00
Jeff Sharkey
6b432fa255
Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev
2016-03-09 23:59:21 +00:00
Vadim Tryshev
aa0dfc8c41
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev am: 4eeb7e2cae
...
am: ed633e97e3
* commit 'ed633e97e35fd8d04a1e0bec812db08b002b30b2':
Fixing bugs with peeking a wallpaper.
2016-03-09 23:52:35 +00:00
Todd Kennedy
a40c3dfac2
Merge "remove splits" into nyc-dev am: f96eee36df
...
am: 33e6d759cb
* commit '33e6d759cb2707bdfd8439f5f2c20f6ec2062c0d':
remove splits
2016-03-09 23:52:35 +00:00
Vadim Tryshev
ed633e97e3
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev
...
am: 4eeb7e2cae
* commit '4eeb7e2cae3d7cae43a35a6cc43b03ab923937bd':
Fixing bugs with peeking a wallpaper.
2016-03-09 23:50:35 +00:00
Todd Kennedy
33e6d759cb
Merge "remove splits" into nyc-dev
...
am: f96eee36df
* commit 'f96eee36df0cc987bafd1f01ce69504191efb8b8':
remove splits
2016-03-09 23:50:34 +00:00
Jeff Sharkey
0d69d3dfe1
Restrict TrafficStats due to privacy concerns.
...
Granular per-UID network statistics can be used to infer user
behavior over time, so they fall under the umbrella of the
PACKAGE_USAGE_STATS permission.
Since we can't check app-ops based permissions in the kernel, the
best we can do is redirect users to the NetworkStatsManager class,
which offers a much more robust historical data set.
Bug: 27577101
Change-Id: I696bdc5e0b3d7e24acf35f388d0ab13617ed8af3
2016-03-09 16:49:45 -07:00
Joe Onorato
713fec85b8
Add an API for apps to get their System Health / Battery Stats data.
...
Change-Id: Ib27e1be469b826f6d83d73ce6024102bbdb1d47a
2016-03-09 15:47:24 -08:00
Vadim Tryshev
4eeb7e2cae
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev
2016-03-09 23:44:23 +00:00
Todd Kennedy
f96eee36df
Merge "remove splits" into nyc-dev
2016-03-09 23:43:21 +00:00