Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
263,922 Commits 3 Branches 0 Tags
7ac0f32c16d4001ec18ba2aba5cfc011d325d524
Commit Graph

66846 Commits

Author SHA1 Message Date
Alan Viverette
7ac0f32c16 Merge commit '75dfc87e5e83c04adf876bc7d0d7cab17a31b4d5' into manual_merge_75dfc87 
Change-Id: Ib55f65f9b00ea6c6515d3e4fc59d86351398b7e1
 2016-05-25 13:16:08 -04:00
Alan Viverette
75dfc87e5e Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c 
am: b9878f0c5a

* commit 'b9878f0c5aab4b540180fb7e36a8e0b41b5e50c2':
  Use ICU's Calendar class in date picker & related classes

Change-Id: I6c9f2c9208cb46ccb4e83f196dfa8ff8ae5ec710
 2016-05-25 16:46:59 +00:00
Alan Viverette
b9878f0c5a Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev 
am: cfbca5640c

* commit 'cfbca5640ca435e1b501254c9cf8b66746799d7e':
  Use ICU's Calendar class in date picker & related classes

Change-Id: Ideb570415bab784778bb12709d04a37ad3c29275
 2016-05-25 16:24:51 +00:00
Alan Viverette
cfbca5640c Merge "Use ICU's Calendar class in date picker & related classes" into nyc-dev 2016-05-25 16:20:16 +00:00
Jiaquan He
a349f8ce7a Merge "Add support for android.R.attr#onTopLauncher" 2016-05-25 16:12:43 +00:00
Alan Viverette
68763be41c Use ICU's Calendar class in date picker & related classes 
Also organizes imports.

Bug: 28756630
Change-Id: I4e59c4b35c88edd94ff4b2945ad9feb2a4bd0022
 2016-05-25 11:42:42 -04:00
Ricky Wai
7b1ccf8700 Merge "Hide work profile key in user credentials screen am: d398244513 am: ed39b3b166" into nyc-mr1-dev-plus-aosp 
am: b5e2592582

* commit 'b5e25925828dd5a23eaa2ea3a4cebcc6652d2762':
  Hide work profile key in user credentials screen

Change-Id: Ie10f57378d3cf1168a9200bf02f3b46d2d1bfe4b
 2016-05-25 13:34:55 +00:00
Ricky Wai
750229fdf0 Hide work profile key in user credentials screen am: d398244513 
am: ed39b3b166

* commit 'ed39b3b1666cff34e34c394029fad0ad9e426968':
  Hide work profile key in user credentials screen

Change-Id: I18cefc9f365ed83db5262676a1f4b9cc28b20c07
 2016-05-25 13:27:41 +00:00
Ricky Wai
b581ebee69 Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd am: 2281b83051 
am: cdb948c81c

* commit 'cdb948c81cdae49a46972bd6ff9acbb02a4a99ce':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: I9b1fb2e49954ac7720e10b809d313e599b17dad1
 2016-05-25 13:27:34 +00:00
Ricky Wai
cdb948c81c Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd 
am: 2281b83051

* commit '2281b83051f8f2d14dfc0a366ed54b1716370412':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: Ia43caa8b23eced60a8ef187ed100b106aedb74a3
 2016-05-25 13:23:24 +00:00
Ricky Wai
ed39b3b166 Hide work profile key in user credentials screen 
am: d398244513

* commit 'd398244513c62c9ea14a0f1c6ffef832e803c16f':
  Hide work profile key in user credentials screen

Change-Id: I5273b53b07cb80d45bac61c8dcc5cba8f6b11b3a
 2016-05-25 13:20:51 +00:00
Ricky Wai
276f168f10 Hide work profile key in user credentials screen 
am: d398244513

* commit 'd398244513c62c9ea14a0f1c6ffef832e803c16f':
  Hide work profile key in user credentials screen

Change-Id: I7609dc8bc68e9c9eb2a969b58b31815d27d7fc4a
 2016-05-25 13:18:26 +00:00
Ricky Wai
2281b83051 Do not allow DPM.resetPassword() when child profile exists or user is locked 
am: 977ade26dd

* commit '977ade26dd8bc6a442be2db2470459058246844f':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: If87e0c523af3fdbd5d0f0182037fba0758cb4cfb
 2016-05-25 13:15:33 +00:00
Ricky Wai
fdf928d4b5 Do not allow DPM.resetPassword() when child profile exists or user is locked 
am: 977ade26dd

* commit '977ade26dd8bc6a442be2db2470459058246844f':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: I05277051a8f30c4d020440dd01b5dc284d552fd4
 2016-05-25 13:14:23 +00:00
Ricky Wai
d398244513 Hide work profile key in user credentials screen 
Bug: 28878708
Change-Id: Ib250fae2388b061430d93b7d65133002ce664993
 2016-05-25 13:11:09 +00:00
Ricky Wai
977ade26dd Do not allow DPM.resetPassword() when child profile exists or user is locked 
Bug: 28878708
Change-Id: Iaae2a9ba9c7c0ff388264c474c78a0dcd9fec258
 2016-05-25 13:09:44 +00:00
Abodunrinwa Toki
ecea7285ac Merge "Filter ACTION_PROCESS_TEXT entries by exported status and permission." 2016-05-25 11:33:06 +00:00
Yohei Yukawa
bbf6a462fd Merge "Make IMM more robust to spurious window focus-in" into nyc-dev am: 50c33d1ca1 am: ef68474698 
am: e5befc5221

* commit 'e5befc52219447de44bae1fe99d99cd43646316f':
  Make IMM more robust to spurious window focus-in

Change-Id: I0e391142d2b299b5dfcabb47b20ed45cd6c4f9aa
 2016-05-25 05:04:59 +00:00
Yohei Yukawa
e5befc5221 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev am: 50c33d1ca1 
am: ef68474698

* commit 'ef684746980061bb5950ae2505229648d9f146d6':
  Make IMM more robust to spurious window focus-in

Change-Id: I77ae5953aa9afc64ef1cd3252d6d2ff936890b62
 2016-05-25 05:02:09 +00:00
Yohei Yukawa
ef68474698 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev 
am: 50c33d1ca1

* commit '50c33d1ca1218ec00eb37f66a7c11315603c9ef7':
  Make IMM more robust to spurious window focus-in

Change-Id: I1d9a138798d982f2164907b49713a7b90cec9adc
 2016-05-25 04:58:20 +00:00
Yohei Yukawa
e8ae33f6e6 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev 
am: 50c33d1ca1

* commit '50c33d1ca1218ec00eb37f66a7c11315603c9ef7':
  Make IMM more robust to spurious window focus-in

Change-Id: I3c80320a5c6711bf3aaeb3043fe54c741c127966
 2016-05-25 04:57:43 +00:00
Yohei Yukawa
50c33d1ca1 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev 2016-05-25 04:47:31 +00:00
Seigo Nonaka
eacdbd0357 Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev am: 7c8305bcfe am: 7b77768d39 
am: 48cb2ee07b

* commit '48cb2ee07b0730522bb5cac0a302f30498fe7312':
  Use original theme for SuggestsionsPopupWindow

Change-Id: I6ad7a97a431b7fc512f7e674f7f2f9628dd16c0c
 2016-05-25 03:41:39 +00:00
Hugo Benichi
bf3ca8a94b Merge "Fix default network transition event recording" into nyc-dev am: 9d4e66ece6 am: bfbf55fcbd 
am: 06facea297

* commit '06facea297bfad572d4354e528d5ea81081e5239':
  Fix default network transition event recording

Change-Id: I37d885e48268e43944fe8afe4dca3f4322d508ac
 2016-05-25 03:41:14 +00:00
Seigo Nonaka
48cb2ee07b Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev am: 7c8305bcfe 
am: 7b77768d39

* commit '7b77768d39fdc1de95bbf32a809b52eb26c9e10d':
  Use original theme for SuggestsionsPopupWindow

Change-Id: Iadf842b82cb178bcaf69c7790051ae3f17b5bd34
 2016-05-25 03:37:22 +00:00
Hugo Benichi
06facea297 Merge "Fix default network transition event recording" into nyc-dev am: 9d4e66ece6 
am: bfbf55fcbd

* commit 'bfbf55fcbd5cbd347642023ab46b22d114f22592':
  Fix default network transition event recording

Change-Id: Ife822c39d617f89dde4cda5f2137b80425fe89ad
 2016-05-25 03:37:19 +00:00
Seigo Nonaka
7b77768d39 Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev 
am: 7c8305bcfe

* commit '7c8305bcfeef206e8bd00f20077f8106bb66fa6b':
  Use original theme for SuggestsionsPopupWindow

Change-Id: Ib724b88ace6e27a499578c473acfd2a909f62068
 2016-05-25 03:31:38 +00:00
Hugo Benichi
bfbf55fcbd Merge "Fix default network transition event recording" into nyc-dev 
am: 9d4e66ece6

* commit '9d4e66ece64f6b65d8a902a6f03f945a0fe88868':
  Fix default network transition event recording

Change-Id: Ic6ae9cd2620b1793f53667eb7d84c0b6f56d716e
 2016-05-25 03:31:34 +00:00
Seigo Nonaka
9995396b26 Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev 
am: 7c8305bcfe

* commit '7c8305bcfeef206e8bd00f20077f8106bb66fa6b':
  Use original theme for SuggestsionsPopupWindow

Change-Id: I77ed2205c4dc34786c1b931a00f64187a878395e
 2016-05-25 03:30:06 +00:00
Hugo Benichi
6a63f7b496 Merge "Fix default network transition event recording" into nyc-dev 
am: 9d4e66ece6

* commit '9d4e66ece64f6b65d8a902a6f03f945a0fe88868':
  Fix default network transition event recording

Change-Id: Ie025342be8e13bfd1d3f4b45d522cc30b56ef606
 2016-05-25 03:29:59 +00:00
Seigo Nonaka
7c8305bcfe Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev 2016-05-25 03:24:11 +00:00
Hugo Benichi
9d4e66ece6 Merge "Fix default network transition event recording" into nyc-dev 2016-05-25 03:22:32 +00:00
Keisuke Kuroyanagi
32c0e434a7 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 am: 66e5b59d85 
am: c2a363fd24

* commit 'c2a363fd24a95e8afd9124e88e7c8227849744cf':
  Set input method mode for CascadingMenuPopup.

Change-Id: If142a782c2cf9b930e16382ab3986dd11821ed1b
 2016-05-25 02:20:36 +00:00
Keisuke Kuroyanagi
c2a363fd24 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 
am: 66e5b59d85

* commit '66e5b59d852e7a746945b0a729cda287bd922187':
  Set input method mode for CascadingMenuPopup.

Change-Id: Ie9efc3abeec02062baccb68615b1ccee5526abd8
 2016-05-25 02:17:01 +00:00
Keisuke Kuroyanagi
30f481368c Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 
am: edebcae978

* commit 'edebcae9781fa897914952e9346a14afd2e08967':
  Set input method mode for CascadingMenuPopup.

Change-Id: I117ea7e9b00fdd8eb26fd761a23925909318a12e
 2016-05-25 02:11:26 +00:00
Keisuke Kuroyanagi
66e5b59d85 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 
am: edebcae978

* commit 'edebcae9781fa897914952e9346a14afd2e08967':
  Set input method mode for CascadingMenuPopup.

Change-Id: I22fcbfb60161aaa660abc43bc9f739829f8e53a5
 2016-05-25 02:11:22 +00:00
Keisuke Kuroyanagi
edebcae978 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 2016-05-25 02:06:25 +00:00
Doris Liu
3cea02f3ce Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d am: 0890a4708e 
am: a38cbfbd1f

* commit 'a38cbfbd1f51da95eb15063a2e7cf412fc1a0e93':
  Clamp start delay to non-negative range

Change-Id: I56a05ae6ba65508f20b91699f319de71641a7fd1
 2016-05-25 01:57:48 +00:00
Doris Liu
a38cbfbd1f Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d 
am: 0890a4708e

* commit '0890a4708efa987322b13ab26e0e499cdb4d789d':
  Clamp start delay to non-negative range

Change-Id: Ib71346f153430ea108797dcefd4c16b3c2cac0b9
 2016-05-25 01:52:12 +00:00
Doris Liu
0890a4708e Merge "Clamp start delay to non-negative range" into nyc-dev 
am: 54d89e078d

* commit '54d89e078d4a4abd6a06362c04f3329fdebd6d7b':
  Clamp start delay to non-negative range

Change-Id: I7cdb14821785d9d29d52b53ef2ff3567f07a3651
 2016-05-25 01:47:30 +00:00
Doris Liu
8147618d3f Merge "Clamp start delay to non-negative range" into nyc-dev 
am: 54d89e078d

* commit '54d89e078d4a4abd6a06362c04f3329fdebd6d7b':
  Clamp start delay to non-negative range

Change-Id: Ifd52004a9ea7eca581ab63d13c879f3717339429
 2016-05-25 01:47:12 +00:00
Doris Liu
54d89e078d Merge "Clamp start delay to non-negative range" into nyc-dev 2016-05-25 01:41:14 +00:00
Chet Haase
2675da9dbf Merge "Remove hidden LocaleList default constructor" into nyc-dev am: ba2cc82399 am: f33737d646 
am: e8de8b7a3b

* commit 'e8de8b7a3b799ead315103c42d08d12a6151e02b':
  Remove hidden LocaleList default constructor

Change-Id: I7e60440bcd2360ed6181b3b5d96f8255e202d13a
 2016-05-25 01:11:49 +00:00
Chet Haase
e8de8b7a3b Merge "Remove hidden LocaleList default constructor" into nyc-dev am: ba2cc82399 
am: f33737d646

* commit 'f33737d6463baad82681bf253419ac4fe25b4bf9':
  Remove hidden LocaleList default constructor

Change-Id: Ice64b7f61186ee03e1f41c7e40c0225ad71679fb
 2016-05-25 01:06:33 +00:00
Hugo Benichi
1654b1d11c Fix default network transition event recording 
When disconnecting from a default network X and falling back on another
connected network Y as the new default, ConnectivityService was
attempting to record this event as a X -> Y "atomic" transition.

In practice the default network connectivity is actually lost and
recovering default network takes some non-zero time.

This patch changes the event recording to always record disconnection as
X -> 0 events. At the same time, if there is a fallback network that is
elected as the new default ConnectivityService will also record a 0 -> Y
event.

This patch also improves pretty-printing of DefaultNetworkEvent.

Extract from $ adb shell dumpsys connectivity_metrics_logger --events
17:51:00.086: DefaultNetworkEvent(0 -> 100:CELLULAR)
17:51:25.232: DefaultNetworkEvent(100:IPv4 -> 101:WIFI) # wifi goes on
17:51:44.064: DefaultNetworkEvent(101:DUAL -> 0)        # wifi goes off
17:51:44.187: DefaultNetworkEvent(0 -> 100:CELLULAR)

Bug: 28204408
Change-Id: I63252633235bf6ba833b9ac431a80dda75a93e67
 2016-05-25 10:03:38 +09:00
Chet Haase
b1da0cf2e5 Merge "Remove hidden LocaleList default constructor" into nyc-dev 
am: ba2cc82399

* commit 'ba2cc82399b89d92f766bbee3b2504a5cdf56215':
  Remove hidden LocaleList default constructor

Change-Id: Ie4da3684f7045cc6439cc86d524e0b0ff1c6eaf7
 2016-05-25 01:02:45 +00:00
Chet Haase
f33737d646 Merge "Remove hidden LocaleList default constructor" into nyc-dev 
am: ba2cc82399

* commit 'ba2cc82399b89d92f766bbee3b2504a5cdf56215':
  Remove hidden LocaleList default constructor

Change-Id: Ia9416e9e318104dc0a29ce8b092036cf4d2b53a8
 2016-05-25 01:02:41 +00:00
Chet Haase
ba2cc82399 Merge "Remove hidden LocaleList default constructor" into nyc-dev 2016-05-25 00:57:41 +00:00
Pavlin Radoslavov
b35b1afd3d Merge "Add missing "try ... finally" safeguards" into nyc-dev am: 0810732a2a am: 505425c063 
am: 2a206db284

* commit '2a206db284847fcd239f50fa37523f52e2ea834e':
  Add missing "try ... finally" safeguards

Change-Id: I61f4b2c7654288fea18e0ab5a22dede839519115
 2016-05-25 00:30:51 +00:00
Daniel Nishi
5da495ee25 Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev am: 9746deefbb 
am: 15d6c4bf7c

* commit '15d6c4bf7c5feb1e77a50ae014e3e2c27740c898':
  Add a flag to toggle the automatic storage manager on and off.

Change-Id: I39652f61fc252bfd7a50b801ea46d7d00c60e83b
 2016-05-25 00:24:51 +00:00