Commit Graph

34011 Commits

Author SHA1 Message Date
Dan Sandler
2db7163cf0 am 2b330dde: Merge "Allow a user to elect to see private notifications in public."
* commit '2b330dde2c46e6e94687649b8e888f9a2d9855bf':
  Allow a user to elect to see private notifications in public.
2014-02-18 14:33:51 -08:00
Dan Sandler
2b330dde2c Merge "Allow a user to elect to see private notifications in public." 2014-02-18 22:30:50 +00:00
Alan Viverette
35ed004d67 am e082ae6b: Merge "Fix sub scroller bounds checking"
* commit 'e082ae6bd6032a1b8f50234b1808287fe7ad124d':
  Fix sub scroller bounds checking
2014-02-18 14:10:23 -08:00
Alan Viverette
e082ae6bd6 Merge "Fix sub scroller bounds checking" 2014-02-18 22:08:24 +00:00
Alan Viverette
bb9364279f Fix sub scroller bounds checking
BUG: 13031919
Change-Id: I6b569b50034fbe70441e11e56706faa9f2acfcbd
2014-02-18 14:07:35 -08:00
Dan Sandler
fd16d56419 Allow a user to elect to see private notifications in public.
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, if
set and nonzero, will show that user's notifications on the
secure lockscreen (assuming LOCK_SCREEN_ALLOW_NOTIFICATIONS
is also set). Note that this applies only to a particular
user's notifications, so if multiple users' notifications
are shown at once (currently this only applies to the
current user and USER_ALL) only that user's notifications
are affected.

USER_ALL is assumed to always allow private notifications in
public (because they can't be user-specific).

Change-Id: I32bb7939066c4919191e74161ca48ead01a88c7f
2014-02-18 15:50:44 -05:00
Zhijun He
d424df6cda am 0ed25174: Merge "Camera2: Update java doc for tone.map.curveRed key"
* commit '0ed25174f98fe473990b1d3298540117d8158e93':
  Camera2: Update java doc for tone.map.curveRed key
2014-02-18 11:12:27 -08:00
Zhijun He
0ed25174f9 Merge "Camera2: Update java doc for tone.map.curveRed key" 2014-02-18 19:10:37 +00:00
Jessica Hummel
b7e4206768 am 587f43d8: Merge "Change API for setProfileOwner to require userId"
* commit '587f43d8725b11632b5d64a0a56a647207f01668':
  Change API for setProfileOwner to require userId
2014-02-18 09:34:11 -08:00
Jessica Hummel
587f43d872 Merge "Change API for setProfileOwner to require userId" 2014-02-18 17:31:31 +00:00
Deepanshu Gupta
389ecda9f8 am c0c4243e: Merge "Fix layoutlib by avoiding Java7 calls"
* commit 'c0c4243e8537a2cb6550ca28e161b8fd2d9b9cbe':
  Fix layoutlib by avoiding Java7 calls
2014-02-17 11:30:23 -08:00
Deepanshu Gupta
c0c4243e85 Merge "Fix layoutlib by avoiding Java7 calls" 2014-02-17 19:28:16 +00:00
Deepanshu Gupta
857ba4af85 Fix layoutlib by avoiding Java7 calls
This change also fixes a NPE in TypedArray caused by changes in the
framework.

Change-Id: Ie64237c567fa16c35c807db22ce9a4b609ee411d
2014-02-17 10:43:01 -08:00
Adam Connors
661ec4710b Change API for setProfileOwner to require userId
Previously the userId of the current process used but it
makes the provisioning process cleaner to be able to pass
it in explicitly.

Change-Id: I670c4cf3638f1340f6d0bf856c3e01045df8c29e
2014-02-17 10:18:59 +00:00
Zhijun He
870922be23 Camera2: Update java doc for tone.map.curveRed key
Change-Id: I39df3a14470a1f051ee3eb11866e7205ea7b16b6
2014-02-15 21:47:51 -08:00
Zhijun He
2df3b5f153 am b35badac: Merge "Camera2: Unhide some capture request templates"
* commit 'b35badac43f742456c4111d1d7369a216409c6f0':
  Camera2: Unhide some capture request templates
2014-02-14 17:54:37 -08:00
Zhijun He
b35badac43 Merge "Camera2: Unhide some capture request templates" 2014-02-15 01:34:57 +00:00
Michael Wright
155a8eb851 am d35ceee7: Merge "Remove Japanese button swap"
* commit 'd35ceee732ad7172e1f7a4261c361591da260120':
  Remove Japanese button swap
2014-02-14 14:46:57 -08:00
Michael Wright
8a5dbac349 Remove Japanese button swap
Bug: 12923922
Change-Id: I4960d8189e751514a595823d7ed9b273e3ff8eb8
2014-02-14 13:20:58 -08:00
Zhijun He
fa8cc5f680 Camera2: Unhide some capture request templates
Change-Id: I13a45b51c129ba562cce0374ae3c63e853144c10
2014-02-14 10:48:38 -08:00
Paul Lawrence
b4aa6c5e74 am a9f387bd: Merge "Support default, pattern, pin and password encryption types"
* commit 'a9f387bdf0a836de8bcb12a46a5cdfcb544fbb1a':
  Support default, pattern, pin and password encryption types
2014-02-14 07:30:52 -08:00
Paul Lawrence
a9f387bdf0 Merge "Support default, pattern, pin and password encryption types" 2014-02-14 15:25:01 +00:00
Narayan Kamath
4750329ee1 am ee904d4d: am 6795e9c7: am 7a66d8ea: am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit 'ee904d4d3ee710f292b607224a6017e843827360':
  AArch64: Use long for pointers in SurfaceSession class
2014-02-14 05:42:19 -08:00
Narayan Kamath
ee904d4d3e am 6795e9c7: am 7a66d8ea: am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '6795e9c783242b31188d76c5186dfe0751f1731a':
  AArch64: Use long for pointers in SurfaceSession class
2014-02-14 13:23:46 +00:00
Narayan Kamath
7a66d8ea7c am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '3bec0fbb349a969934828ee726956877a3a21dee':
  AArch64: Use long for pointers in SurfaceSession class
2014-02-14 13:17:13 +00:00
Narayan Kamath
fa8f95e9b9 Merge "AArch64: Use long for pointers in SurfaceSession class" 2014-02-14 13:10:44 +00:00
Jeff Brown
0c3cda3408 am 88aaef71: am ce0552f3: am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern.
* commit '88aaef71289177644f723d3d0f20f34a6f9b3d2c':
  Refactor dream manager to new pattern.
2014-02-14 01:54:32 -08:00
Jeff Brown
88aaef7128 am ce0552f3: am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern.
* commit 'ce0552f360d8c8f0bc45095293be369800ce9c93':
  Refactor dream manager to new pattern.
2014-02-14 09:50:37 +00:00
Jeff Brown
8a4c2bb1f0 am 567f7ca4: Refactor dream manager to new pattern.
* commit '567f7ca424280ae957b04d4f3df690055f2d41df':
  Refactor dream manager to new pattern.
2014-02-14 09:14:09 +00:00
Jeff Brown
567f7ca424 Refactor dream manager to new pattern.
Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
2014-02-13 23:26:59 -08:00
Alan Viverette
e192e344fa am 23160f4f: Merge "Refactor AbsListView position scrollers for better abstraction"
* commit '23160f4fb911811759643bd3ef42e7b96abc1265':
  Refactor AbsListView position scrollers for better abstraction
2014-02-13 17:52:21 -08:00
Alan Viverette
23160f4fb9 Merge "Refactor AbsListView position scrollers for better abstraction" 2014-02-14 01:48:59 +00:00
Alan Viverette
d22db216fe Refactor AbsListView position scrollers for better abstraction
The AbsListView sub-scroller knows nothing about layout. That's now
handled by ListView and GridView, with subclasses of AbsListView using
the default PositionScroller. Removes unnecessary (unreleased) APIs.

Also fixes a bounds check that was using the item position rather than
the child view position.

BUG: 13006641
Change-Id: I2adb0f15623e32295facf81f5ada974083ba03ce
2014-02-13 17:47:38 -08:00
Fabrice Di Meglio
98f5a7a963 am 73f3a33b: Merge "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"
* commit '73f3a33b46691deb9ce7f3ce54feef8c973686ff':
  Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog
2014-02-13 17:45:48 -08:00
Fabrice Di Meglio
73f3a33b46 Merge "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog" 2014-02-14 01:42:36 +00:00
Alan Viverette
787f6f0e97 am 7d57765d: Merge "Add selection properties to CollectionInfo, CollectionItemInfo"
* commit '7d57765db927d8803bd8898463cc6f9979b6bf35':
  Add selection properties to CollectionInfo, CollectionItemInfo
2014-02-13 17:17:54 -08:00
Alan Viverette
7d57765db9 Merge "Add selection properties to CollectionInfo, CollectionItemInfo" 2014-02-14 01:15:04 +00:00
Fabrice Di Meglio
08189afdb0 Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog
- do not make inactive the fragment when its transition animation is ending.

Long explanation:

Context: you need to have a first fragment pushed and then a second one replacing
the first one, and then create a DialogFragment on top of it. The FragmentManager
has then three "active" Fragments.

The mActive ArrayList of the FragmentManager is then containing:

mActive[0] = first fragment
mActive[1] = second fragment (parent of the dialog fragment)
mActive[2[ = dialog fragment

Then suppose you are changing the orientation.

During the restoration of the FragmentManager states, you will see that the
first Fragment is marked "inactive" and the mActive ArrayList is looking like:

mActive[0] = dialog fragment
mActive[1] = second fragment

which leads first to have a call to onCreateDialog() for the DialogFragment and
before it can be able to restore its state thru the calls to onCreate() and
onCreateView() for the parent (the second fragment).

Change-Id: I0268bdf13e4bdd07a783c2c82a13b431d0c5c8e4
2014-02-13 17:02:11 -08:00
Guang Zhu
4f6f993e0f am 831663d8: Merge "reduce error logs from disconnected AccessibilityNodeInfo\'s"
* commit '831663d8fad6b31fb01b626dc2c15623690cbf37':
  reduce error logs from disconnected AccessibilityNodeInfo's
2014-02-13 10:48:23 -08:00
Guang Zhu
831663d8fa Merge "reduce error logs from disconnected AccessibilityNodeInfo's" 2014-02-13 18:45:25 +00:00
Dianne Hackborn
5c2fa68e7a am d39ccd0a: Merge "Start tracking radio up time."
* commit 'd39ccd0ad9cb562b0093eaf78a5273b000c0aa7a':
  Start tracking radio up time.
2014-02-13 09:58:44 -08:00
Dianne Hackborn
d39ccd0ad9 Merge "Start tracking radio up time." 2014-02-13 17:56:12 +00:00
Dianne Hackborn
e13c4c0b66 Start tracking radio up time.
We now always turn on network state tracking for mobile,
and push this information down to battery stats.

In battery stats we use this to both log the changes in
the history and keep track of the total time the mobile
radio was active.

Power computation is switched over to using this information
to help determine power use, which will hopefully make it
more accurate (not counting inaccuracies in knowing when it
actually goes down).

Note yet done is aggregating this data per-uid, to better
emphasize which apps are causing the radio to be up.  Right
now we just spread the total time across all uids weighted
by the total number of packets they have sent and received.

Also put in the battery stats infrastructure for bluetooth to
address issue #12973036: Improve power_profile.xml

Change-Id: I39d11b7ff6ae4f336f253d1cba308d8569de7e0d
2014-02-13 17:55:40 +00:00
Paul Lawrence
8e39736f91 Support default, pattern, pin and password encryption types
Java plumbing to expose methods to get/set encryption type in
IMountService, and hooking up of those methods to the Settings app
so the type is set correctly.

Needs matching vold changes from
 https://googleplex-android-review.googlesource.com/#/c/412649/

Bug: 8769627
Change-Id: I70c0ed72d11f5ab6f0958a7f9c101b6822b13baa
2014-02-13 15:46:24 +00:00
Guang Zhu
32569caa6a reduce error logs from disconnected AccessibilityNodeInfo's
ChromeView generates a large amount of such logs; while the real
root cause is being fixed, reduce the verbosity so other
interesting logs won't get overwritten.

Bug: 10871032
Change-Id: If42116671062d7b2cc2a13384424575da499c493
2014-02-12 17:27:15 -08:00
Alan Viverette
76769ae02e Add selection properties to CollectionInfo, CollectionItemInfo
BUG: 12552541
Change-Id: Iae10abc02eeffea7c7fcb25020b343181e1e3482
2014-02-12 16:38:10 -08:00
ztenghui
d4d87466c4 am b67ca78d: Merge "Fix one flag setting bug"
* commit 'b67ca78d97f775cfd5b37e9a63fc708fd2897d01':
  Fix one flag setting bug
2014-02-12 16:18:23 -08:00
ztenghui
b67ca78d97 Merge "Fix one flag setting bug" 2014-02-13 00:16:37 +00:00
Alan Viverette
2a7fc2bf15 am 71c6ca2a: Merge "Update smoothScrollToPosition to move faster for large offsets"
* commit '71c6ca2a752d9b722a9774a881f8e539a24ea862':
  Update smoothScrollToPosition to move faster for large offsets
2014-02-12 15:55:03 -08:00
Alan Viverette
aa32af1c4f am 5aa944d9: Merge "Fix RelativeLayout measurement"
* commit '5aa944d9985344ac3be113eee3874be920bf12d2':
  Fix RelativeLayout measurement
2014-02-12 15:55:00 -08:00